Change in openvpn[master]: Change type of max_clients to uint32_t
A message that is not in the archive (sent off-list or not yet received): gerrit.1773241811000.I8d6b7bc1b7744dc6d57aaed3231b8901275752f2@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email
to review the following change.
Change subject: Change type of max_clients to uint32_t
......................................................................
Change type of max_clients to uint32_t
peer_id is mostly this already (except in DCO context for some reason), and max_peerid was defined as uint32_t as well. So changing max_clients to uint32_t avoids many -Wsign-compare warnings.
While here fix limit for max_clients in options
parsing. It is not allowed to be MAX_PEER_ID
exactly.
---
M src/openvpn/dco_freebsd.c
M src/openvpn/dco_linux.c
M src/openvpn/dco_win.c
M src/openvpn/mudp.c
M src/openvpn/multi.c
M src/openvpn/multi.h
M src/openvpn/options.c
M src/openvpn/options.h
8 files changed, 10 insertions(+), 64 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/1564/1
src/openvpn/dco_freebsd.c +0 -9
@@ -559,11 +559,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static void dco_update_peer_stat (struct multi_context *m,uint32_t peerid,const nvlist_t *nvl) {
@@ -582,10 +577,6 @@ __func__, peerid, mi->context.c2.dco_read_bytes, mi->context.c2.dco_write_bytes); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_read_and_process (dco_context_t *dco) {
src/openvpn/dco_linux.c +1 -10
@@ -858,11 +858,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static int ovpn_handle_peer (dco_context_t *dco,struct nlattr *attrs[]) {
@@ -889,7 +884,7 @@if (dco->ifmode ==OVPN_MODE_P2P ) { c2 = &dco->c->c2; -if (c2->tls_multi->dco_peer_id != peer_id) +if (c2->tls_multi->dco_peer_id != (int )peer_id) {return NL_SKIP ; }
@@ -918,10 +913,6 @@return NL_OK ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -static bool ovpn_iface_check (dco_context_t *dco,struct nlattr *attrs[]) {
src/openvpn/dco_win.c +2 -11
@@ -739,11 +739,6 @@return 0 ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -int dco_get_peer_stats_multi (dco_context_t *dco,const bool raise_sigusr1_on_err) {
@@ -838,9 +833,9 @@ {OVPN_PEER_STATS *stat = &peer_stats[i]; -if (stat->PeerId >= dco->c->multi->max_clients) +if (stat->PeerId >= (int )dco->c->multi->max_clients) { -msg (M_WARN ,"%s: received out of bound peer_id %u (max=%u)" , __func__, stat->PeerId, +msg (M_WARN ,"%s: received out of bound peer_id %d (max=%u)" , __func__, stat->PeerId, dco->c->multi->max_clients);continue ; }
@@ -871,10 +866,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_get_peer_stats_fallback (struct context *c,const bool raise_sigusr1_on_err) {
src/openvpn/mudp.c +1 -10
@@ -180,11 +180,6 @@return false; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Get a client instance based on real address. If * the instance doesn't exist, create it while
@@ -217,7 +212,7 @@uint32_t peer_id = ((uint32_t )ptr[1 ] <<16 ) | ((uint32_t )ptr[2 ] <<8 ) | ((uint32_t )ptr[3 ]); peer_id_disabled = (peer_id ==MAX_PEER_ID ); -if (!peer_id_disabled && (peer_id < m->max_clients) && (m->instances[peer_id])) +if (!peer_id_disabled && (peer_id < m->max_clients) && m->instances[peer_id]) {/* Floating on TCP will never be possible, so ensure we only process * UDP clients */
@@ -315,10 +310,6 @@return mi; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Send a packet to UDP socket. */
src/openvpn/multi.c +2 -20
@@ -695,11 +695,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Create a client instance object for a newly connected client. */
@@ -782,10 +777,6 @@return NULL ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Dump tables -- triggered by SIGUSR2. * If status file is defined, write to file.
@@ -3261,7 +3252,7 @@return ; } -if ((peer_id < m->max_clients) && (m->instances[peer_id])) +if (((uint32_t )peer_id < m->max_clients) && m->instances[peer_id]) {struct multi_instance *mi = m->instances[peer_id];set_prefix (mi);
@@ -4085,18 +4076,13 @@#endif /* ifdef ENABLE_MANAGEMENT */ } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -void multi_assign_peer_id (struct multi_context *m,struct multi_instance *mi) {/* max_clients must be less then max peer-id value */ ASSERT (m->max_clients <MAX_PEER_ID ); -for (int i =0 ; i < m->max_clients; ++i) +for (uint32_t i =0 ; i < m->max_clients; ++i) {if (!m->instances[i]) {
@@ -4117,10 +4103,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/** * @brief Determines the earliest wakeup interval based on periodic operations. *
src/openvpn/multi.h +1 -1
@@ -182,7 +182,7 @@struct multi_reap *reaper;struct mroute_addr local;bool enable_c2c; -int max_clients; +uint32_t max_clients;int tcp_queue_limit;int status_file_version;int n_clients;/* current number of authenticated clients */
src/openvpn/options.c +2 -2
@@ -1431,7 +1431,7 @@SHOW_INT (cf_per);SHOW_INT (cf_initial_max);SHOW_INT (cf_initial_per); -SHOW_INT (max_clients); +SHOW_UINT (max_clients);SHOW_INT (max_routes_per_client);SHOW_STR (auth_user_pass_verify_script);SHOW_BOOL (auth_user_pass_verify_script_via_file);
@@ -7354,7 +7354,7 @@else if (streq (p[0 ],"max-clients" ) && p[1 ] && !p[2 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); -if (!atoi_constrained (p[1 ], &options->max_clients, p[0 ],1 ,MAX_PEER_ID , msglevel)) +if (!atoi_constrained (p[1 ], (int *)&options->max_clients, p[0 ],1 ,MAX_PEER_ID -1 , msglevel)) { goto err; }
src/openvpn/options.h +1 -1
@@ -530,7 +530,7 @@int cf_initial_max;int cf_initial_per; -int max_clients; +uint32_t max_clients;int max_routes_per_client;int stale_routes_check_interval;int stale_routes_ageing_time;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231b8901275752f2
Gerrit-Change-Number: 1564
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email )
Change subject: Change type of max_clients to uint32_t
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231b8901275752f2
Gerrit-Change-Number: 1564
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 07 Apr 2026 11:24:17 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
PATCH 1/1 Change type of max_clients to uint32_t
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
peer_id is mostly this already (except in DCO context for some reason), and max_peerid was defined as uint32_t as well. So changing max_clients to uint32_t avoids many -Wsign-compare warnings.
While here fix limit for max_clients in options
parsing. It is not allowed to be MAX_PEER_ID
exactly.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1564
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1564
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/dco_freebsd.c +0 -9
@@ -559,11 +559,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static void dco_update_peer_stat (struct multi_context *m,uint32_t peerid,const nvlist_t *nvl) {
@@ -582,10 +577,6 @@ __func__, peerid, mi->context.c2.dco_read_bytes, mi->context.c2.dco_write_bytes); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_read_and_process (dco_context_t *dco) {
src/openvpn/dco_linux.c +1 -10
@@ -858,11 +858,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static int ovpn_handle_peer (dco_context_t *dco,struct nlattr *attrs[]) {
@@ -889,7 +884,7 @@if (dco->ifmode ==OVPN_MODE_P2P ) { c2 = &dco->c->c2; -if (c2->tls_multi->dco_peer_id != peer_id) +if (c2->tls_multi->dco_peer_id != (int )peer_id) {return NL_SKIP ; }
@@ -918,10 +913,6 @@return NL_OK ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -static bool ovpn_iface_check (dco_context_t *dco,struct nlattr *attrs[]) {
src/openvpn/dco_win.c +2 -11
@@ -739,11 +739,6 @@return 0 ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -int dco_get_peer_stats_multi (dco_context_t *dco,const bool raise_sigusr1_on_err) {
@@ -838,9 +833,9 @@ {OVPN_PEER_STATS *stat = &peer_stats[i]; -if (stat->PeerId >= dco->c->multi->max_clients) +if (stat->PeerId >= (int )dco->c->multi->max_clients) { -msg (M_WARN ,"%s: received out of bound peer_id %u (max=%u)" , __func__, stat->PeerId, +msg (M_WARN ,"%s: received out of bound peer_id %d (max=%u)" , __func__, stat->PeerId, dco->c->multi->max_clients);continue ; }
@@ -871,10 +866,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_get_peer_stats_fallback (struct context *c,const bool raise_sigusr1_on_err) {
src/openvpn/mudp.c +1 -10
@@ -180,11 +180,6 @@return false; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Get a client instance based on real address. If * the instance doesn't exist, create it while
@@ -217,7 +212,7 @@uint32_t peer_id = ((uint32_t )ptr[1 ] <<16 ) | ((uint32_t )ptr[2 ] <<8 ) | ((uint32_t )ptr[3 ]); peer_id_disabled = (peer_id ==MAX_PEER_ID ); -if (!peer_id_disabled && (peer_id < m->max_clients) && (m->instances[peer_id])) +if (!peer_id_disabled && (peer_id < m->max_clients) && m->instances[peer_id]) {/* Floating on TCP will never be possible, so ensure we only process * UDP clients */
@@ -315,10 +310,6 @@return mi; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Send a packet to UDP socket. */
src/openvpn/multi.c +2 -20
@@ -695,11 +695,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Create a client instance object for a newly connected client. */
@@ -782,10 +777,6 @@return NULL ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Dump tables -- triggered by SIGUSR2. * If status file is defined, write to file.
@@ -3261,7 +3252,7 @@return ; } -if ((peer_id < m->max_clients) && (m->instances[peer_id])) +if (((uint32_t )peer_id < m->max_clients) && m->instances[peer_id]) {struct multi_instance *mi = m->instances[peer_id];set_prefix (mi);
@@ -4085,18 +4076,13 @@#endif /* ifdef ENABLE_MANAGEMENT */ } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -void multi_assign_peer_id (struct multi_context *m,struct multi_instance *mi) {/* max_clients must be less then max peer-id value */ ASSERT (m->max_clients <MAX_PEER_ID ); -for (int i =0 ; i < m->max_clients; ++i) +for (uint32_t i =0 ; i < m->max_clients; ++i) {if (!m->instances[i]) {
@@ -4117,10 +4103,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/** * @brief Determines the earliest wakeup interval based on periodic operations. *
src/openvpn/multi.h +1 -1
@@ -182,7 +182,7 @@struct multi_reap *reaper;struct mroute_addr local;bool enable_c2c; -int max_clients; +uint32_t max_clients;int tcp_queue_limit;int status_file_version;int n_clients;/* current number of authenticated clients */
src/openvpn/options.c +2 -2
@@ -1431,7 +1431,7 @@SHOW_INT (cf_per);SHOW_INT (cf_initial_max);SHOW_INT (cf_initial_per); -SHOW_INT (max_clients); +SHOW_UINT (max_clients);SHOW_INT (max_routes_per_client);SHOW_STR (auth_user_pass_verify_script);SHOW_BOOL (auth_user_pass_verify_script_via_file);
@@ -7354,7 +7354,7 @@else if (streq (p[0 ],"max-clients" ) && p[1 ] && !p[2 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); -if (!atoi_constrained (p[1 ], &options->max_clients, p[0 ],1 ,MAX_PEER_ID , msglevel)) +if (!atoi_constrained (p[1 ], (int *)&options->max_clients, p[0 ],1 ,MAX_PEER_ID -1 , msglevel)) { goto err; }
src/openvpn/options.h +1 -1
@@ -530,7 +530,7 @@int cf_initial_max;int cf_initial_per; -int max_clients; +uint32_t max_clients;int max_routes_per_client;int stale_routes_check_interval;int stale_routes_ageing_time;
[Openvpn-devel] [PATCH applied] Re: Change type of max_clients to uint32_t
I thought this needed the previous patch (introduce max_peerid) as basis, but it's independent - different iterating loops. To be sure the combination would not introduce new warnings -> -Werror build errors I pushed this to gerrit + GHA and let both build...
Your patch has been applied to the master branch.
commit 0e1899971e4f0e8e73b22347925aefaa19d635d2
Author: Frank Lichtenheld Date: Tue Apr 7 13:24:28 2026 +0200
Change type of max_clients to uint32_t
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1564
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36535.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Attention is currently required from: cron2, flichtenheld, plaisthos.
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
The change is no longer submittable: Code-Review and checks~ChecksSubmitRule are unsatisfied now.
Change subject: Change type of max_clients to uint32_t
......................................................................
Change type of max_clients to uint32_t
peer_id is mostly this already (except in DCO context for some reason), and max_peerid was defined as uint32_t as well. So changing max_clients to uint32_t avoids many -Wsign-compare warnings.
While here fix limit for max_clients in options
parsing. It is not allowed to be MAX_PEER_ID
exactly.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1564
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36535.html
---
M src/openvpn/dco_freebsd.c
M src/openvpn/dco_linux.c
M src/openvpn/dco_win.c
M src/openvpn/mudp.c
M src/openvpn/multi.c
M src/openvpn/multi.h
M src/openvpn/options.c
M src/openvpn/options.h
8 files changed, 10 insertions(+), 64 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/1564/2
src/openvpn/dco_freebsd.c +0 -9
@@ -559,11 +559,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static void dco_update_peer_stat (struct multi_context *m,uint32_t peerid,const nvlist_t *nvl) {
@@ -582,10 +577,6 @@ __func__, peerid, mi->context.c2.dco_read_bytes, mi->context.c2.dco_write_bytes); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_read_and_process (dco_context_t *dco) {
src/openvpn/dco_linux.c +1 -10
@@ -859,11 +859,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static int ovpn_handle_peer (dco_context_t *dco,struct nlattr *attrs[]) {
@@ -890,7 +885,7 @@if (dco->ifmode ==OVPN_MODE_P2P ) { c2 = &dco->c->c2; -if (c2->tls_multi->dco_peer_id != peer_id) +if (c2->tls_multi->dco_peer_id != (int )peer_id) {return NL_SKIP ; }
@@ -919,10 +914,6 @@return NL_OK ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -static bool ovpn_iface_check (dco_context_t *dco,struct nlattr *attrs[]) {
src/openvpn/dco_win.c +2 -11
@@ -739,11 +739,6 @@return 0 ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -int dco_get_peer_stats_multi (dco_context_t *dco,const bool raise_sigusr1_on_err) {
@@ -838,9 +833,9 @@ {OVPN_PEER_STATS *stat = &peer_stats[i]; -if (stat->PeerId >= dco->c->multi->max_clients) +if (stat->PeerId >= (int )dco->c->multi->max_clients) { -msg (M_WARN ,"%s: received out of bound peer_id %u (max=%u)" , __func__, stat->PeerId, +msg (M_WARN ,"%s: received out of bound peer_id %d (max=%u)" , __func__, stat->PeerId, dco->c->multi->max_clients);continue ; }
@@ -871,10 +866,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_get_peer_stats_fallback (struct context *c,const bool raise_sigusr1_on_err) {
src/openvpn/mudp.c +1 -10
@@ -180,11 +180,6 @@return false; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Get a client instance based on real address. If * the instance doesn't exist, create it while
@@ -217,7 +212,7 @@uint32_t peer_id = ((uint32_t )ptr[1 ] <<16 ) | ((uint32_t )ptr[2 ] <<8 ) | ((uint32_t )ptr[3 ]); peer_id_disabled = (peer_id ==MAX_PEER_ID ); -if (!peer_id_disabled && (peer_id < m->max_clients) && (m->instances[peer_id])) +if (!peer_id_disabled && (peer_id < m->max_clients) && m->instances[peer_id]) {/* Floating on TCP will never be possible, so ensure we only process * UDP clients */
@@ -315,10 +310,6 @@return mi; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Send a packet to UDP socket. */
src/openvpn/multi.c +2 -20
@@ -695,11 +695,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Create a client instance object for a newly connected client. */
@@ -782,10 +777,6 @@return NULL ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Dump tables -- triggered by SIGUSR2. * If status file is defined, write to file.
@@ -3261,7 +3252,7 @@return ; } -if ((peer_id < m->max_clients) && (m->instances[peer_id])) +if (((uint32_t )peer_id < m->max_clients) && m->instances[peer_id]) {struct multi_instance *mi = m->instances[peer_id];set_prefix (mi);
@@ -4085,18 +4076,13 @@#endif /* ifdef ENABLE_MANAGEMENT */ } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -void multi_assign_peer_id (struct multi_context *m,struct multi_instance *mi) {/* max_clients must be less then max peer-id value */ ASSERT (m->max_clients <MAX_PEER_ID ); -for (int i =0 ; i < m->max_clients; ++i) +for (uint32_t i =0 ; i < m->max_clients; ++i) {if (!m->instances[i]) {
@@ -4117,10 +4103,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/** * @brief Determines the earliest wakeup interval based on periodic operations. *
src/openvpn/multi.h +1 -1
@@ -182,7 +182,7 @@struct multi_reap *reaper;struct mroute_addr local;bool enable_c2c; -int max_clients; +uint32_t max_clients;int tcp_queue_limit;int status_file_version;int n_clients;/* current number of authenticated clients */
src/openvpn/options.c +2 -2
@@ -1428,7 +1428,7 @@SHOW_INT (cf_per);SHOW_INT (cf_initial_max);SHOW_INT (cf_initial_per); -SHOW_INT (max_clients); +SHOW_UINT (max_clients);SHOW_INT (max_routes_per_client);SHOW_STR (auth_user_pass_verify_script);SHOW_BOOL (auth_user_pass_verify_script_via_file);
@@ -7378,7 +7378,7 @@else if (streq (p[0 ],"max-clients" ) && p[1 ] && !p[2 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); -if (!atoi_constrained (p[1 ], &options->max_clients, p[0 ],1 ,MAX_PEER_ID , msglevel)) +if (!atoi_constrained (p[1 ], (int *)&options->max_clients, p[0 ],1 ,MAX_PEER_ID -1 , msglevel)) { goto err; }
src/openvpn/options.h +1 -1
@@ -530,7 +530,7 @@int cf_initial_max;int cf_initial_per; -int max_clients; +uint32_t max_clients;int max_routes_per_client;int stale_routes_check_interval;int stale_routes_ageing_time;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231b8901275752f2
Gerrit-Change-Number: 1564
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email )
Change subject: Change type of max_clients to uint32_t
......................................................................
Change type of max_clients to uint32_t
peer_id is mostly this already (except in DCO context for some reason), and max_peerid was defined as uint32_t as well. So changing max_clients to uint32_t avoids many -Wsign-compare warnings.
While here fix limit for max_clients in options
parsing. It is not allowed to be MAX_PEER_ID
exactly.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1564
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36535.html
---
M src/openvpn/dco_freebsd.c
M src/openvpn/dco_linux.c
M src/openvpn/dco_win.c
M src/openvpn/mudp.c
M src/openvpn/multi.c
M src/openvpn/multi.h
M src/openvpn/options.c
M src/openvpn/options.h
8 files changed, 10 insertions(+), 64 deletions(-)
src/openvpn/dco_freebsd.c +0 -9
@@ -559,11 +559,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static void dco_update_peer_stat (struct multi_context *m,uint32_t peerid,const nvlist_t *nvl) {
@@ -582,10 +577,6 @@ __func__, peerid, mi->context.c2.dco_read_bytes, mi->context.c2.dco_write_bytes); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_read_and_process (dco_context_t *dco) {
src/openvpn/dco_linux.c +1 -10
@@ -859,11 +859,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -static int ovpn_handle_peer (dco_context_t *dco,struct nlattr *attrs[]) {
@@ -890,7 +885,7 @@if (dco->ifmode ==OVPN_MODE_P2P ) { c2 = &dco->c->c2; -if (c2->tls_multi->dco_peer_id != peer_id) +if (c2->tls_multi->dco_peer_id != (int )peer_id) {return NL_SKIP ; }
@@ -919,10 +914,6 @@return NL_OK ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -static bool ovpn_iface_check (dco_context_t *dco,struct nlattr *attrs[]) {
src/openvpn/dco_win.c +2 -11
@@ -739,11 +739,6 @@return 0 ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -int dco_get_peer_stats_multi (dco_context_t *dco,const bool raise_sigusr1_on_err) {
@@ -838,9 +833,9 @@ {OVPN_PEER_STATS *stat = &peer_stats[i]; -if (stat->PeerId >= dco->c->multi->max_clients) +if (stat->PeerId >= (int )dco->c->multi->max_clients) { -msg (M_WARN ,"%s: received out of bound peer_id %u (max=%u)" , __func__, stat->PeerId, +msg (M_WARN ,"%s: received out of bound peer_id %d (max=%u)" , __func__, stat->PeerId, dco->c->multi->max_clients);continue ; }
@@ -871,10 +866,6 @@return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -int dco_get_peer_stats_fallback (struct context *c,const bool raise_sigusr1_on_err) {
src/openvpn/mudp.c +1 -10
@@ -180,11 +180,6 @@return false; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Get a client instance based on real address. If * the instance doesn't exist, create it while
@@ -217,7 +212,7 @@uint32_t peer_id = ((uint32_t )ptr[1 ] <<16 ) | ((uint32_t )ptr[2 ] <<8 ) | ((uint32_t )ptr[3 ]); peer_id_disabled = (peer_id ==MAX_PEER_ID ); -if (!peer_id_disabled && (peer_id < m->max_clients) && (m->instances[peer_id])) +if (!peer_id_disabled && (peer_id < m->max_clients) && m->instances[peer_id]) {/* Floating on TCP will never be possible, so ensure we only process * UDP clients */
@@ -315,10 +310,6 @@return mi; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Send a packet to UDP socket. */
src/openvpn/multi.c +2 -20
@@ -695,11 +695,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -/* * Create a client instance object for a newly connected client. */
@@ -782,10 +777,6 @@return NULL ; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/* * Dump tables -- triggered by SIGUSR2. * If status file is defined, write to file.
@@ -3261,7 +3252,7 @@return ; } -if ((peer_id < m->max_clients) && (m->instances[peer_id])) +if (((uint32_t )peer_id < m->max_clients) && m->instances[peer_id]) {struct multi_instance *mi = m->instances[peer_id];set_prefix (mi);
@@ -4085,18 +4076,13 @@#endif /* ifdef ENABLE_MANAGEMENT */ } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -void multi_assign_peer_id (struct multi_context *m,struct multi_instance *mi) {/* max_clients must be less then max peer-id value */ ASSERT (m->max_clients <MAX_PEER_ID ); -for (int i =0 ; i < m->max_clients; ++i) +for (uint32_t i =0 ; i < m->max_clients; ++i) {if (!m->instances[i]) {
@@ -4117,10 +4103,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif -/** * @brief Determines the earliest wakeup interval based on periodic operations. *
src/openvpn/multi.h +1 -1
@@ -182,7 +182,7 @@struct multi_reap *reaper;struct mroute_addr local;bool enable_c2c; -int max_clients; +uint32_t max_clients;int tcp_queue_limit;int status_file_version;int n_clients;/* current number of authenticated clients */
src/openvpn/options.c +2 -2
@@ -1428,7 +1428,7 @@SHOW_INT (cf_per);SHOW_INT (cf_initial_max);SHOW_INT (cf_initial_per); -SHOW_INT (max_clients); +SHOW_UINT (max_clients);SHOW_INT (max_routes_per_client);SHOW_STR (auth_user_pass_verify_script);SHOW_BOOL (auth_user_pass_verify_script_via_file);
@@ -7378,7 +7378,7 @@else if (streq (p[0 ],"max-clients" ) && p[1 ] && !p[2 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); -if (!atoi_constrained (p[1 ], &options->max_clients, p[0 ],1 ,MAX_PEER_ID , msglevel)) +if (!atoi_constrained (p[1 ], (int *)&options->max_clients, p[0 ],1 ,MAX_PEER_ID -1 , msglevel)) { goto err; }
src/openvpn/options.h +1 -1
@@ -530,7 +530,7 @@int cf_initial_max;int cf_initial_per; -int max_clients; +uint32_t max_clients;int max_routes_per_client;int stale_routes_check_interval;int stale_routes_ageing_time;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1564?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231b8901275752f2
Gerrit-Change-Number: 1564
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>